🎖️GitЯра🎖️
Commit c1269b0d8ef484e84e1048c77dd24ff41f63904d
Parents : bcff2ad
Author : renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-06-17T18:31:43-05:00
Committer : GitHub <noreply@github.com>
Date : 2026-06-17T18:31:43-05:00
chore(deps): update room to v3.0.0-rc01 (#5835)
Co-authored-by: James Rich <james.a.rich@gmail.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Changes
3 files changed, 27 insertions(+), 24 deletions(-)
Diff
diff --git a/core/database/src/commonMain/kotlin/org/meshtastic/core/database/Converters.kt b/core/database/src/commonMain/kotlin/org/meshtastic/core/database/Converters.kt
index 81277115dc..239086d7dc 100644
--- a/core/database/src/commonMain/kotlin/org/meshtastic/core/database/Converters.kt
+++ b/core/database/src/commonMain/kotlin/org/meshtastic/core/database/Converters.kt
@@ -16,7 +16,7 @@
*/
package org.meshtastic.core.database
-import androidx.room3.TypeConverter
+import androidx.room3.ColumnTypeConverter
import co.touchlab.kermit.Logger
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
@@ -42,41 +42,43 @@ class Converters {
exceptionsWithDebugInfo = false
}
- @TypeConverter fun dataFromString(value: String): DataPacket = json.decodeFromString(DataPacket.serializer(), value)
+ @ColumnTypeConverter
+ fun dataFromString(value: String): DataPacket = json.decodeFromString(DataPacket.serializer(), value)
- @TypeConverter fun dataToString(value: DataPacket): String = json.encodeToString(DataPacket.serializer(), value)
+ @ColumnTypeConverter
+ fun dataToString(value: DataPacket): String = json.encodeToString(DataPacket.serializer(), value)
- @TypeConverter
+ @ColumnTypeConverter
fun bytesToFromRadio(bytes: ByteArray): FromRadio = FromRadio.ADAPTER.decodeOrNull(bytes, Logger) ?: FromRadio()
- @TypeConverter fun fromRadioToBytes(value: FromRadio): ByteArray = FromRadio.ADAPTER.encode(value)
+ @ColumnTypeConverter fun fromRadioToBytes(value: FromRadio): ByteArray = FromRadio.ADAPTER.encode(value)
- @TypeConverter fun bytesToUser(bytes: ByteArray): User = User.ADAPTER.decodeOrNull(bytes, Logger) ?: User()
+ @ColumnTypeConverter fun bytesToUser(bytes: ByteArray): User = User.ADAPTER.decodeOrNull(bytes, Logger) ?: User()
- @TypeConverter fun userToBytes(value: User): ByteArray = User.ADAPTER.encode(value)
+ @ColumnTypeConverter fun userToBytes(value: User): ByteArray = User.ADAPTER.encode(value)
- @TypeConverter
+ @ColumnTypeConverter
fun bytesToPosition(bytes: ByteArray): Position = Position.ADAPTER.decodeOrNull(bytes, Logger) ?: Position()
- @TypeConverter fun positionToBytes(value: Position): ByteArray = Position.ADAPTER.encode(value)
+ @ColumnTypeConverter fun positionToBytes(value: Position): ByteArray = Position.ADAPTER.encode(value)
- @TypeConverter
+ @ColumnTypeConverter
fun bytesToTelemetry(bytes: ByteArray): Telemetry = Telemetry.ADAPTER.decodeOrNull(bytes, Logger) ?: Telemetry()
- @TypeConverter fun telemetryToBytes(value: Telemetry): ByteArray = Telemetry.ADAPTER.encode(value)
+ @ColumnTypeConverter fun telemetryToBytes(value: Telemetry): ByteArray = Telemetry.ADAPTER.encode(value)
- @TypeConverter
+ @ColumnTypeConverter
fun bytesToPaxcounter(bytes: ByteArray): Paxcount = Paxcount.ADAPTER.decodeOrNull(bytes, Logger) ?: Paxcount()
- @TypeConverter fun paxCounterToBytes(value: Paxcount): ByteArray = Paxcount.ADAPTER.encode(value)
+ @ColumnTypeConverter fun paxCounterToBytes(value: Paxcount): ByteArray = Paxcount.ADAPTER.encode(value)
- @TypeConverter
+ @ColumnTypeConverter
fun bytesToMetadata(bytes: ByteArray): DeviceMetadata =
DeviceMetadata.ADAPTER.decodeOrNull(bytes, Logger) ?: DeviceMetadata()
- @TypeConverter fun metadataToBytes(value: DeviceMetadata): ByteArray = DeviceMetadata.ADAPTER.encode(value)
+ @ColumnTypeConverter fun metadataToBytes(value: DeviceMetadata): ByteArray = DeviceMetadata.ADAPTER.encode(value)
- @TypeConverter
+ @ColumnTypeConverter
fun fromStringList(value: String?): List<String>? {
if (value == null) {
return null
@@ -84,7 +86,7 @@ class Converters {
return Json.decodeFromString<List<String>>(value)
}
- @TypeConverter
+ @ColumnTypeConverter
fun toStringList(list: List<String>?): String? {
if (list == null) {
return null
@@ -92,12 +94,13 @@ class Converters {
return Json.encodeToString(list)
}
- @TypeConverter fun bytesToByteString(bytes: ByteArray?): ByteString? = bytes?.toByteString()
+ @ColumnTypeConverter fun bytesToByteString(bytes: ByteArray?): ByteString? = bytes?.toByteString()
- @TypeConverter fun byteStringToBytes(value: ByteString?): ByteArray? = value?.toByteArray()
+ @ColumnTypeConverter fun byteStringToBytes(value: ByteString?): ByteArray? = value?.toByteArray()
- @TypeConverter fun messageStatusToInt(value: MessageStatus?): Int = value?.ordinal ?: MessageStatus.UNKNOWN.ordinal
+ @ColumnTypeConverter
+ fun messageStatusToInt(value: MessageStatus?): Int = value?.ordinal ?: MessageStatus.UNKNOWN.ordinal
- @TypeConverter
+ @ColumnTypeConverter
fun intToMessageStatus(value: Int): MessageStatus = MessageStatus.entries.getOrElse(value) { MessageStatus.UNKNOWN }
}
diff --git a/core/database/src/commonMain/kotlin/org/meshtastic/core/database/MeshtasticDatabase.kt b/core/database/src/commonMain/kotlin/org/meshtastic/core/database/MeshtasticDatabase.kt
index 2d7eb56254..18013c0b48 100644
--- a/core/database/src/commonMain/kotlin/org/meshtastic/core/database/MeshtasticDatabase.kt
+++ b/core/database/src/commonMain/kotlin/org/meshtastic/core/database/MeshtasticDatabase.kt
@@ -17,11 +17,11 @@
package org.meshtastic.core.database
import androidx.room3.AutoMigration
+import androidx.room3.ColumnTypeConverters
import androidx.room3.Database
import androidx.room3.DeleteColumn
import androidx.room3.DeleteTable
import androidx.room3.RoomDatabase
-import androidx.room3.TypeConverters
import androidx.room3.migration.AutoMigrationSpec
import org.meshtastic.core.common.util.ioDispatcher
import org.meshtastic.core.database.dao.DeviceHardwareDao
@@ -117,7 +117,7 @@ import org.meshtastic.core.database.entity.TracerouteNodePositionEntity
exportSchema = true,
)
@androidx.room3.ConstructedBy(MeshtasticDatabaseConstructor::class)
-@TypeConverters(Converters::class)
+@ColumnTypeConverters(Converters::class)
@androidx.room3.DaoReturnTypeConverters(androidx.room3.paging.PagingSourceDaoReturnTypeConverter::class)
abstract class MeshtasticDatabase : RoomDatabase() {
abstract fun nodeInfoDao(): NodeInfoDao
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d67e2ea287..afe632dfa1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ lifecycle = "2.11.0"
jetbrains-lifecycle = "2.11.0-beta02"
navigation3 = "1.1.1"
paging = "3.5.0"
-room = "3.0.0-alpha06"
+room = "3.0.0-rc01"
koin = "4.2.2"
koin-plugin = "1.0.1"
Served by rngit 1.5.0 - Generated in 0.07s